Merge tag 'upstream/2016.12' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 25 Oct 2016 21:29:03 +0000 (22:29 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 25 Oct 2016 21:29:03 +0000 (22:29 +0100)
commitbc870baa582b4889a9b2e49fe4c15b8e806c5432
treef2e113204149c2a8e7e97b4ea99f634c2c40d2cd
parent15be1f569a632ae9afbe7287833eaf2438cec305
parente011f1a1a14792f68b3082ce2fa6da718a842d15
Merge tag 'upstream/2016.12' into debian/master

Upstream version 2016.12